From ad0c4c3e83b90adf2973edf7618c087ac473db01 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 20 Feb 2014 12:38:32 -0500 Subject: [PATCH] window: Fix configure request debug code in move_resize Make it compile in GTK+3 and switch pos_changed / size_changed to be the right way around. --- gtk/gtkwindow.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 64ab2b7b54..b5d10311ec 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -9357,16 +9357,14 @@ gtk_window_move_resize (GtkWindow *window) #if 0 if (priv->type == GTK_WINDOW_TOPLEVEL) { - int notify_x, notify_y; + GtkAllocation alloc; + + gtk_widget_get_allocation (widget, &alloc); - /* this is the position from the last configure notify */ - gdk_window_get_position (widget->window, ¬ify_x, ¬ify_y); - g_message ("--- %s ---\n" "last : %d,%d\t%d x %d\n" "this : %d,%d\t%d x %d\n" "alloc : %d,%d\t%d x %d\n" - "req : \t%d x %d\n" "resize: \t%d x %d\n" "size_changed: %d pos_changed: %d hints_changed: %d\n" "configure_notify_received: %d\n" @@ -9381,15 +9379,14 @@ gtk_window_move_resize (GtkWindow *window) new_request.y, new_request.width, new_request.height, - notify_x, notify_y, - widget->allocation.width, - widget->allocation.height, - widget->requisition.width, - widget->requisition.height, + alloc.x, + alloc.y, + alloc.width, + alloc.height, info->resize_width, info->resize_height, - configure_request_pos_changed, configure_request_size_changed, + configure_request_pos_changed, hints_changed, priv->configure_notify_received, priv->configure_request_count, -- 2.30.2